auto merge of #576 : alexcrichton/cargo/update, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 15 Sep 2014 15:35:26 +0000 (15:35 +0000)
committerbors <bors@rust-lang.org>
Mon, 15 Sep 2014 15:35:26 +0000 (15:35 +0000)

Trivial merge